manifest: Update to v3.3.0-preview2 with 2026.01.12 upmerge#192
Merged
trantanen merged 4 commits intonrfconnect:mainfrom Mar 10, 2026
Merged
manifest: Update to v3.3.0-preview2 with 2026.01.12 upmerge#192trantanen merged 4 commits intonrfconnect:mainfrom
trantanen merged 4 commits intonrfconnect:mainfrom
Conversation
SeppoTakalo
requested changes
Feb 23, 2026
trantanen
force-pushed
the
ncsmain_upmerge
branch
4 times, most recently
from
3ac183f to
de9464b
Compare
trantanen
changed the title
trantanen
force-pushed
the
ncsmain_upmerge
branch
2 times, most recently
from
5f853f1 to
57335c5
Compare
SeppoTakalo
approved these changes
Mar 5, 2026
Collaborator
Author
|
I have confirmed that DFU for full MFW works with |
MarkusLassila
approved these changes
Mar 10, 2026
Update sdk-nrf and adapt to the 2026.01.12 upmerge: nrfconnect/sdk-nrf#26468 Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
File descriptor counting has been refactored in Zephyr. CONFIG_POSIX_OPEN_MAX should not be used anymore. SM should enable 8 sockets allowed by the modem and NRF_MODEM_MAX_SOCKET_COUNT is for this purpose. This was brought into NCS by the 2026.01.12 upmerge: nrfconnect/sdk-nrf#26468 Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
Networking related types, functions and structures got net_ or zsock_ prefix depending on the case. Doing corresponding changes to SM. This was brought into NCS by the 2026.01.12 upmerge: nrfconnect/sdk-nrf#26468 Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
trantanen
force-pushed
the
ncsmain_upmerge
branch
from
57335c5 to
06d5ece
Compare
TF-M/PSA configuration changed in nrfconnect/sdk-nrf#26777 TF-M default profile changed from CONFIG_TFM_PROFILE_TYPE_MINIMAL to CONFIG_TFM_PROFILE_TYPE_NOT_SET. SM will use minimal profile by default but basic profile (not set) is needed for SHA256 crypto for full modem fota support, which then also needs a different partition layout for TF-M. Signed-off-by: Tommi Rantanen <tommi.rantanen@nordicsemi.no>
trantanen
force-pushed
the
ncsmain_upmerge
branch
from
06d5ece to
30dd558
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update sdk-nrf to v3.3.0-preview2. Implement changes required by:
File descriptor counting has been refactored in Zephyr.
CONFIG_POSIX_OPEN_MAXshould not be used anymore. SM should enable 8 sockets allowed by the modem andNRF_MODEM_MAX_SOCKET_COUNTis for this purpose.Networking related types, functions and structures got
net_orzsock_prefix depending on the case. Doing corresponding changes to SM.TF-M default profile changed from
CONFIG_TFM_PROFILE_TYPE_MINIMALtoCONFIG_TFM_PROFILE_TYPE_NOT_SET. SM will use minimal profile by default but basic profile (not set) is needed for SHA256 crypto for full modem fota support, which then also needs a different partition layout for TF-M.